Refactor to avoid some duplication. Convert toplevel GtkMenu's top popups

2007-12-20  Johan Dahlin  <johan@gnome.org>

	* gtk/gtk-builder-convert (GtkBuilderConverter._remove_window):
	Refactor to avoid some duplication.
	Convert toplevel GtkMenu's top popups and not menubars in the ui manager.
	Fixes #504749, Yuri Pimenov

svn path=/trunk/; revision=19213

diff --git a/ChangeLog b/ChangeLog
index 6e63f8b92c01daae19450cca53d3a23c24fe6a3a..4ba02bcef0cd69641344054102ce9ecae800ea31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
+2007-12-20  Johan Dahlin  <johan@gnome.org>
+
+       * gtk/gtk-builder-convert (GtkBuilderConverter._remove_window): 
+       Refactor to avoid some duplication.
+       Convert toplevel GtkMenu's top popups and not menubars in the ui manager.
+       Fixes #504749, Yuri Pimenov
+
 2007-12-20  Kristian Rietveld  <kris@imendio.com>
 
-       * configure.in: Remove leftovers from old XRandR check.  Makes
+       * configure.in: RYuri Pimenovemove leftovers from old XRandR check.  Makes
        the build work again on systems without xrandr 1.2.
 
 2007-12-20  Christian Persch  <chpe@gnome.org>

diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert
index d62fc6b4abd4c6d31fca2bc6fd707a9597c6197c..f2a94098a5fc8dfce6e3ab10fc38c56b294020b9 100755 (executable)
--- a/gtk/gtk-builder-convert
+++ b/gtk/gtk-builder-convert
@@ -241,9 +241,11 @@ class GtkBuilderConverter(object):
             self._packing_prop_to_child_attr(
                 node, "type", "label_item", "label")
         elif klass == "GtkMenuBar":
-            self._convert_menubar(node)
-        elif klass == "GtkMenu":
             self._convert_menu(node)
+        elif klass == "GtkMenu":
+            # Only convert toplevel popups
+            if node.parentNode == self._interface:
+                self._convert_menu(node, popup=True)
         elif klass in WINDOWS and self.skip_windows:
             self._remove_window(node)
         self._default_widget_converter(node)
@@ -279,42 +281,20 @@ class GtkBuilderConverter(object):
         parent.removeChild(node)
         parent.appendChild(object_node)
 
-    def _convert_menubar(self, node):
+    def _convert_menu(self, node, popup=False):
         if node.hasAttribute('constructor'):
             return
 
         uimgr = self._create_root_object('GtkUIManager',
                                          template='uimanager')
 
-        menubar = self._dom.createElement('menubar')
-        menubar.setAttribute('name', node.getAttribute('id'))
-        node.setAttribute('constructor', uimgr.getAttribute('id'))
-
-        for child in get_child_nodes(node):
-            obj_node = get_object_node(child)
-            item = self._convert_menuitem(uimgr, obj_node)
-            menubar.appendChild(item)
-            child.removeChild(obj_node)
-            child.parentNode.removeChild(child)
-
-        ui = self._dom.createElement('ui')
-        uimgr.appendChild(ui)
-
-        ui.appendChild(menubar)
-
-    def _convert_menu(self, node):
-        if node.hasAttribute('constructor'):
-            return
-
-        # Only convert toplevel menu objects
-        if node.parentNode != self._interface:
-            return
-        uimgr = self._create_root_object('GtkUIManager',
-                                         template='uimanager')
+        if popup:
+            name = 'popup'
+        else:
+            name = 'menubar'
 
-        menu = self._dom.createElement('menubar')
+        menu = self._dom.createElement(name)
         menu.setAttribute('name', node.getAttribute('id'))
-
         node.setAttribute('constructor', uimgr.getAttribute('id'))
 
         for child in get_child_nodes(node):